added query handlers controllers