QUICKFIX - don't trigger redundant selects