added auto registration for query handlers