some fixes to gain backward compatibility, added a test for suggestions