Fixes annoying behavior with the response
Starts to port to Angular: 50% less code so far!