Feature/search bugfix

Bug fixes and enhancements for the SearchQueryBuilder object.