Internal refactor: change Select by Where; upper case tag test and implementation