finalize refactoring of keyword matching by the RequestsController
code layout
clean code