More structure into search action
Working nested contexts in queries