change hardcoded item and property ids

Change-Id: I4ccc33dbe4eba8c8ef6fd171ec9e0d62b227109a