Fix locations form
Fix locations form