add checks regarding the graph parameter and other bug fixes
Merge branch 'develop' of https://github.com/ers-devs/ers into global_server