reworking search stuff