Okay, I can see that this is being used by the search page as well. Perhaps it's okay for it to be split out then.