Remove single quotes and use arrays where needed in forms