Follow up to fix hibernate criteria for searching drugs by mapping