removed over cautious nullchecks on MatchQueryDescriptor fix #262