Work in progress on saved search functionality