Fixed Add entity navigation