More structure into search action