Cleaned up search and profile and abstracted out the visibility filter.