New search options & Fixes