Update returns number of updated rows, which will be always 1 in our case
Use the correct id

Will fix #798
Updated changelog
Merge branch 'master' into 798-wrong-item-was-hilighted

Conflicts:
	CHANGELOG.md
Merge branch '798-wrong-item-was-hilighted'