[EJ] More validation stuff for enquiries