improve maf query selectors