Un-Reverting my change due to Postgres issue with the ILIKE function, thanks to fernando for pointing it out