Endpoint parser fixes as per 04.04.2014 feedback