[TASK] add search field and minor adjustments