WIP: Add keywords search mode