Fixed issue where & would cause a 500 error