Fixing query to fix fillmein