Database fixed to handle phrases

Data-handling now takes into account the constant in Constant.m to
include single words or not.