Fixing Search stuff