Added various fixes to search
Post merge