Fixes for tags
Fixed entry spacing