Fixed regex problems
Small JSON fix