Fixed keywords and contexts filtering to use trans fields