Fixed up queries and 404 pipeline