Changed filtering example to something more meaningful, reordered query
Reorder query and added filtering