Search option now working