WIP: Add keywords search mode (keyword-search branch)