Rename composeQuery to compose_query