Advanced search: change query parsing for sub metadata