service provider views fixes. Submitted by kiran & sanjay.