Integrated parser into search and added sort order