Added Enhanced Search Options