Saved search keyword search bug

DMO-4533

Fixed an issue where a user with a primary functional location would not get the expected results when searching with keywords on saved searches. This also applied to searching in saved searches filtered by functional locations.