Merge "Refactor all saved query related logic into a controller"