Rx Search Controller Refactor