moved queries from controller to service