Query Fixes