cleanup and full support colon uri