Removed search and added options