Fixed options and added helper methods for query building