Jag/fix gateway table ip empty