adding validation to the subscription page
adding missed fixes for mock service