improved POS Only queries