Fixing query selectors