Reorganize controllers; bind query to CwbSearchesController