Moving logic into LocationsCriteria