Update routes to fix Q creation