fixes to the raptor json and admin templates