Fixed the damn 's' issue.
Fixed search and query building options