Include extra database information in check
Remove empty quotes to prevent accidental extra argument