* Fix service annotations * Filter area_id from service data * Fix services not accepting entities * Typo