Fixed bug in polling service, added unit to frontend