Entry list fixes and additional features