Added filters and validators on client edit form