Fixed up a couple of query classes for flex attr support.
ironing out some kinks