bug fix for the modules: clients map, users, availability