Add parse for query