Search view fixes