Fixing bugs around indexes of routing and id property