More strict tax declarations and menus

towards #166 and #308