Feature/4.0.6 2 saved search

Fixed issue with saved search not being able to be saved