Fixed so convert is working on properties and current page works