fix remove state and fix status getUrl from
updates from sanmiks project