new logic, less db hits, faster [MJ-502]