-- Fixed search issues #11