Adjustments in querie, start adding stuff for tmux table