Merge the shared queries and queries endpoint into a single endpoint