Query Pre-processing of Topological Constraints: Comparing a Composition-Based with Neighborhood-Based Approach uri icon