Updated labels feature

All tests passing locally. Verified functionality via hpi:run.