fixed issues in index and listing