[#1088] Fixed some minor search related issues