Fixes for Search Option Next|Prev abstract