[SLC] Add query builder options
Merge pull request #967 from FabioBatSilva/slc-query-builder

[SLC] Add query builder options