switched whitelist to handle pset (search by key)