Removing dependency on ilike