NameQuery parser added