query adjusts and better naming for default