Started working on issue 1234
Second part to fix
Merge branch 'issue1234'

Conflicts:
	YSA_Records_Assist/index.php