Fixing random space getting into the property URL structure definition + clean-up...