Optimization - shortcircuit a few useless conditions that ask a lot from the DB - refs BT#7140