validation fixes related to modal