Bug fixes; implemented back wallabag@6e8030a and wallabag@08f539f7