Added a couple of useful search options