Add filter options to getAll
Syntax cleanup