Fix for per-directory listing and "marker" support added