fix crud_controller query merging