use entity/get-by-id where possible