Fixes on search