Updated how we are trimming the URI for the non-standard actions