VE Sprint 22

TODO: Add a "FIXME" or "TODO" this is not a solid fix for https://wikia-inc.atlassian.net/browse/VE-1346