Always including location-form, removed default forms