Decouple search and options