Search feature + some bugfix