Refactored, consolidated queries

This will initially appear to be a step backward, as prioritizing search results by relevance (# of hits) is now broken and has temporarily been removed.  However, the code has been refactored for greater simplicity and improved efficiency.  Two to three separate database queries have been consolidated into a single query, into which the landmark type search (if needed) is inserted on the fly.  Some loops and conditionals are no longer necessary and have been removed.  All of these changes cut access time significantly and reduce demand on the server.  Recent implementation of sorting by relevance must now be adjusted accordingly, and will be reintroduced with the next push.