Minor bug fix and added extra parameter for forced hash generation from
custom field