Enhanced saved search
Fix merging conflicts