fixed queries
speed up simple queries testing