Add select + fix Search for FF