Fixed similar issue for corner handle, SCI-1801
Added some missing metadata items and refactored code