Add @NickyNouse's search tweaks to originals