rework on clicontroller for queries