Fixes To The Search Function