Added in new searching options