Add more options
FIX backwards search did not work properly