Separated variables for APIServer into APIServer and APIServerDir.
Fixed typo in queue-item template and fixed some spacing.