added app query parsing;