added logs table and filters
conflict resolved