Mob 2187

@aquilax @rogatty @RafLeszczynski @nandy-andy This fixes following issues:
https://wikia-inc.atlassian.net/browse/MOB-2195
https://wikia-inc.atlassian.net/browse/MOB-2194
https://wikia-inc.atlassian.net/browse/MOB-2187
Makes sense. Will do.