Moved get_unique_name to helpers, tidied Filter