Created SearchQueryBuilder; Query tweaks for faster/more efficient searches