DB Handler : minor correction and use # delimiter into regex