Some simplifications

* ilike_operator replaced by ILIKE
* return keywords removed when not necessary
* using `map` to collect the values of a loop