fix issues with predicate filtering, also fix some issues with the
PropertyQueryReference handling.