exclude service shops and do some fix