Use static query flags for common flags #528