Parse query fix