Replace ' with " and fix location work splitting