Fixing queries, WIP