Fixesfor options not allowing false values. Addition of countByQuery