Fix bug#4371 Navi: expansion on the db name works only once

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>