Implemented searching with additional options