JC-1981 Use class attribute instead of id for form selecting